Merge branch 'develop' of http://github.com/prawnonwarp/bitstarter into develop
added the bitcoin stuff;
Merge branch 'develop' into staging