clean up gemgile.lock
remove turbolinks from asset pipeline
Merge branch 'master' of github.com:StephanMusgrave/ProjectX