Version bump

Signed-off-by: Adam Jimerson <vendion@gmail.com>
Merge branch 'release/20141228'
Merge branch 'master' into develop