Fix .tmp directories not being accessible from web
Add conditional gitignore
Fix conditionals
Update htaccess code
Merge branch 'master' of github.com:drgfunk/generator-tmproject into drgfunk-master

Conflicts:
	app/templates/_htaccess
Merge branch 'drgfunk-master'
Increment version
Hotfix htaccess and Gruntfile
Fix ignoring bower_components
Use Sass instead of Compass to compile
Add mixins to make transition away from Compass easier
Move resources to an `/assets/` directory to avoid conflicts with CMS directories
update generator with browserify, remove requirejs and dependents, update javascript examples to use browserify
Merge branch 'browserfy'