remove spotify
merge
add tmux config link
Upgrade boxen to 2.0.4
Update a bunch of modules
Update a bunch of gems
versions
Merge branch 'master' of git://github.com/boxen/our-boxen

# By Rafael Mendonça França
# Via Rafael Mendonça França
* 'master' of git://github.com/boxen/our-boxen:
  Upgrade boxen to 2.0.4
Merge branch 'mavericks-updates' of git://github.com/boxen/our-boxen

# By Will Farrington
# Via Will Farrington
* 'mavericks-updates' of git://github.com/boxen/our-boxen:
  Update a bunch of gems
  Update a bunch of modules

Conflicts:
	Puppetfile
	Puppetfile.lock
update