Gem updates
accidentally had some internal controller functions as actions
move to ruby 2
some refactors, more css playing and addition to application yml template. also removed lots of cruft
whoops
Merge branch 'develop'