wip Mon Apr  7 02:17:00 EDT 2014
final cleanup
Merge branch 'feature/rewrite' into develop