bump to 24.2-boxen2
add .travis.yml
upgrade cardboard (and frickin everything else apparently)
fix spec
Emacs 24.3
Merge remote-tracking branch 'bleything/master'

Conflicts:
	files/brews/emacs.rb
	manifests/init.pp
Fix Emacs build
License

Fixes #7
Merge in upstream 1.1.0

Merge remote-tracking branch 'refs/remotes/upstream/master'