prepping v1.1.0 - 1
prepping v1.1.0 - 2 Rails 4.1.6 working
prepping v1.1.0 - 2 readme update
Merge branch 'master' of github.com:dsaronin/milia into newdev

merged in some previous changes