dubious refactor
Merge branch 'master' of git://github.com/burntcookie90/Spectra into burntcookie90-master

Conflicts:
	lib/spectra/templates/template.rb
Merge branch 'burntcookie90-master'
added simple create function
bumped version
Merge pull request #1 from derkis/master

pulling in from master