Merge branch 'master' of https://github.com/vocino/vocino.com

# By Travis Vocino (96) and Bitdeli Chef (1)
* 'master' of https://github.com/vocino/vocino.com: (97 commits)
  better blogging setup
  cleaning up the header, simple!
  cleanup time
  slight cleanup, better layout stuff
  updates
  gem update
  header cleanup
  next previous links
  logo file
  cleaned
  responsive header and footer
  page title helper
  update feed, temporary typekit disable
  typekit async
  fixed type, clean up gems
  cleanup for redesign
  header change
  responsive grid
  modernizr
  normalize
  ...
aws in ignore
Merge branch 'develop'

* develop:
  major updates
  scss updates
  article staging
  clean up article partials

Conflicts:
	.gitignore
Merge branch 'develop'

* develop:
  travis.yaml
  update layouts
  move nav to the bottom, add fittest
  fix twitch embed
  twitch stuff, animation
  twitch api
  bower for reals
  updated bower setup
  bower updates
  cleanup and bower
Merge branch 'develop'

* develop:
  yml instead
update readme