added git deploy
Merge branch 'deploy'
added unicorn conf
ignore vim swap files
fixed master merge conflicts with gems
Merge pull request #26 from m3talsmith/master

Latest with deploy and merge conflicts from design