Remove uneeded whitespace from files created on init
Merge remote-tracking branch 'upstream/master'
Fix import error
Add color to "Build failure" warning
Merge pull request #766 from burz/master

Fix an import error and add color to "Build failure" warning.