Fixed BPM Parse and made BPM Band Grab
Merge branch 'jonathan' of https://github.com/jmelcher86/BeatNik
Merge branch 'master' of https://github.com/jmelcher86/BeatNik into jonathan

Trying to figure out why Andrew's version of parser.py doesn't compile.

testing
cleanup
Merge branch 'master' of https://github.com/jmelcher86/BeatNik into jonathan

Conflicts:
	bin/parser.py
cleanup