Refactor and cleanup code, fix regular expression.
Remove in-place test cases from file.
Remove commented out line
Merge branch 'master' of github.com:cjlwired/aspen into cjlwired-master

Conflicts:
	lib/aspen.rb
Generate aspen-0.1.7.gem after merge from cjlwired
Move aspen-0.1.6 to versions directory