Trying stuff for merthyr deploy

Taking out pipeline stuff and precompiling
Allow Leap to run on jruby - so we can host on Windows
Revert "Trying stuff for merthyr deploy"

This reverts commit 4dda15031cf68e0be47d4eb020731c4490e38cad.

Conflicts:
	Gemfile
	Gemfile.lock
Left merge conflicts in gemfile.lock
Left a conflict in...
Merge branch 'merthyr' of github.com:sdc/leap into merthyr
Slight tweak to some gem vers and add trinidad for windows hosting
Add precompiled application.js until I work out why it won't compile on Windows.
Right gems for talking to mssql from jruby
Don't want vendor dir any more
Merge branch 'merthyr' of github.com:sdc/leap into merthyr
Jruby for merthyr
WIP: Stuff to get Leap working at Merthyr
Merge branch 'merthyr' of github.com:sdc/leap into merthyr
Added precompiled assets which don't want to compile on windows
Fix layout if no address
Hack to detect staff users at Merthyr; need to merge with option
Hacks to get timetables working on Merthyr's EBS - need to config out these changes before merge
More hacks for timetables @ Merthyr
Merge branch 'master' into merthyr

Conflicts:
	Gemfile