Merge pull request #8 from DavidXArnold/master

Added support for ubuntu 14.04
Updating gitignore
Merge pull request #9 from cyberswat/master

Updating gitignore
Updating travis encrypted vars.
Updating bundle path.
Updating some paths for travis.
Updating paths.
Correcting yaml format.
Take that.
moved to vendor/cookbooks for berks and updated build rake task to use environment variables for arguments
Merge remote-tracking branch 'upstream/master'
added format changes to Rakefiel as well as merged upstream changes.
Conflicts:
	.gitignore