review pushing
Merge branch 'middletier_move' of github.com:stealthycoin/toilet_mapper into middletier_move