Created by: SecUpwN
This PR will sync the master into the development branch. To avoid further confusion and the need to sync back and forth in the future, I will highlight the instruction to use the development branch both in our CONTRIBUTING.md as well as README.md. GitHub support will assist me crafting a better setup for developers so that they either "have to" use the development branch or at least make that more clear.
master will be rejected from now on!
NOTE: Please do not merge this until Wed, 11 Feb 2015 23:12:03 +0000 UTC as it appears that Travis CI is experiencing trouble with their building machines. You can view the current status here. Thank you.