Turned off old template caching
Initial setup
bcrypt-ruby back
Adding compiled assets
Remove  compiled assets
angular-rails-templates gem 0.1.1
Merge branch 'refresh_votes_count_rake_task' into angular-rails-templates_merge

Conflicts:
	Gemfile.lock
Moving order of js load and merged gemfile lock
Trying White Hat's suggestions
Remove Custom haml/slim on the pipeline config
Search&Replace "/assets/" -> "" (fixes templateUrls)
Update ng-includes to use cached assets
Last change I see in WhiteHat's work besides path changes: enable haml "ugly" mode
Merge pull request #1 from whitehat101/angular-rails-templates

Angular Rails Templates
Merge remote-tracking branch 'kimmiller/angular-rails-templates-140502' into angular-rails-templates-140502

Conflicts:
	config/application.rb
	config/initializers/angular_assets.rb
Merge branch 'master' into angular-rails-templates-140502
Set some of the HAML setting back to how they were
config.assets.version setting to expire assets
Merge pull request #306 from kimardenmiller/angular-rails-templates-140502

Angular rails templates 140502